bitkeeper revision 1.1159.207.1 (41d3ed24aepggBU18HkAQtTK4p7Z9A)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

diff --cc .rootkeys
Simple merge

diff --cc xen/arch/x86/setup.c
index bce33d1aa95d096385ba8c8972eb03c7fdd99413,1b0cd8494cdbf7ab9b83bdbf3a298de867e182bf..15c712f553779d966460817892a0132fe4c33670
--- 1/xen/arch/x86/setup.c
--- 2/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@@ -472,13 -468,15 +473,15 @@@ void __init __start_xen(multiboot_info_
      unsigned long max_mem;
      unsigned long dom0_memory_start, dom0_memory_end;
      unsigned long initial_images_start, initial_images_end;
+     struct e820entry e820_raw[E820MAX];
+     int e820_raw_nr = 0, bytes = 0;
  
      /* Parse the command-line options. */
-     cmdline = (unsigned char *)(mbi->cmdline ? __va(mbi->cmdline) : NULL);
-     cmdline_parse(cmdline);
+     if ( (mbi->flags & MBI_CMDLINE) && (mbi->cmdline != 0) )
+         cmdline_parse(__va(mbi->cmdline));
  
      /* Must do this early -- e.g., spinlocks rely on get_current(). */
 -    set_current(&idle0_task);
 +    set_current(&idle0_exec_domain);
  
      /* We initialise the serial devices very early so we can get debugging. */
      serial_init_stage1();